Merge branch 'master' of git://git.denx.de/u-boot-net
authorTom Rini <[email protected]>
Wed, 8 Mar 2017 12:14:18 +0000 (07:14 -0500)
committerTom Rini <[email protected]>
Wed, 8 Mar 2017 12:14:18 +0000 (07:14 -0500)

Trivial merge